Merge branch 'master' into 3219-further-docker-improvements
authorWard Vandewege <ward@curoverse.com>
Thu, 24 Jul 2014 14:00:35 +0000 (10:00 -0400)
committerWard Vandewege <ward@curoverse.com>
Thu, 24 Jul 2014 14:00:35 +0000 (10:00 -0400)

Trivial merge