Merge branch '8567-docker-migrator' refs #8567
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 24 Mar 2017 13:31:36 +0000 (09:31 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 24 Mar 2017 13:31:36 +0000 (09:31 -0400)

Trivial merge