Merge branch 'master' into 3219-further-docker-improvements
authorWard Vandewege <ward@curoverse.com>
Tue, 15 Jul 2014 19:28:16 +0000 (15:28 -0400)
committerWard Vandewege <ward@curoverse.com>
Tue, 15 Jul 2014 19:28:16 +0000 (15:28 -0400)

Trivial merge