3824: Merge branch 'master' into 3824-crunch-container-setup
authorTom Clegg <tom@curoverse.com>
Thu, 30 Oct 2014 17:02:56 +0000 (13:02 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 30 Oct 2014 17:02:56 +0000 (13:02 -0400)

Trivial merge