2809: Merge branch '2809-workbench-rails4' refs #2809
authorTom Clegg <tom@curoverse.com>
Thu, 15 May 2014 18:19:32 +0000 (14:19 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 15 May 2014 18:19:32 +0000 (14:19 -0400)

Trivial merge