3894: Merge branch 'master' into 3894-gem-version
authorTom Clegg <tom@curoverse.com>
Fri, 19 Sep 2014 21:40:28 +0000 (17:40 -0400)
committerTom Clegg <tom@curoverse.com>
Fri, 19 Sep 2014 21:40:28 +0000 (17:40 -0400)

Trivial merge