3894: Merge branch 'master' into 3894-gem-version
authorTom Clegg <tom@curoverse.com>
Mon, 22 Sep 2014 15:19:04 +0000 (11:19 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 22 Sep 2014 15:19:04 +0000 (11:19 -0400)

Trivial merge