Merge branch '8697-ruby187-compat'
authorTom Clegg <tom@curoverse.com>
Wed, 20 Apr 2016 14:30:04 +0000 (10:30 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 20 Apr 2016 14:30:04 +0000 (10:30 -0400)
refs #8697
refs #8689


Trivial merge