Merge branch '8567-moar-docker' refs #8567
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 12 Apr 2017 20:10:13 +0000 (16:10 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 12 Apr 2017 20:10:13 +0000 (16:10 -0400)

Trivial merge