7709: Merge branch 'master' into 7709-api-rails4
authorTom Clegg <tom@curoverse.com>
Wed, 26 Apr 2017 14:33:13 +0000 (10:33 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 26 Apr 2017 14:33:13 +0000 (10:33 -0400)

Trivial merge