Merge branch '11606-rails4-no-munge'
authorTom Clegg <tom@curoverse.com>
Wed, 3 May 2017 14:20:52 +0000 (10:20 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 3 May 2017 14:20:52 +0000 (10:20 -0400)
closes #11606


Trivial merge