3036: Merge branch 'master' into 3036-mutable-collections
authorTom Clegg <tom@curoverse.com>
Thu, 7 Aug 2014 20:32:59 +0000 (16:32 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 7 Aug 2014 20:32:59 +0000 (16:32 -0400)

Trivial merge