Merge branch 'master' into 10797-ruby-2.3
authorWard Vandewege <ward@curoverse.com>
Wed, 15 Feb 2017 22:25:24 +0000 (17:25 -0500)
committerWard Vandewege <ward@curoverse.com>
Wed, 15 Feb 2017 22:25:24 +0000 (17:25 -0500)
refs #10797


Trivial merge