Merge branch '6838-docker-path' closes #6838
authorTom Clegg <tom@curoverse.com>
Tue, 4 Aug 2015 12:57:28 +0000 (08:57 -0400)
committerTom Clegg <tom@curoverse.com>
Tue, 4 Aug 2015 12:57:28 +0000 (08:57 -0400)

Trivial merge