Merge branch '5539-better-docker' closes #5539
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 31 Mar 2015 15:18:58 +0000 (11:18 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 31 Mar 2015 15:18:58 +0000 (11:18 -0400)

Trivial merge