3824: Merge branch 'master' into 3824-docker-fixes
authorTom Clegg <tom@curoverse.com>
Thu, 20 Nov 2014 15:38:27 +0000 (10:38 -0500)
committerTom Clegg <tom@curoverse.com>
Thu, 20 Nov 2014 15:38:27 +0000 (10:38 -0500)

Trivial merge