Merge branch '7868-docker-run-args' closes #7868
authorTom Clegg <tom@curoverse.com>
Wed, 2 Dec 2015 21:56:40 +0000 (16:56 -0500)
committerTom Clegg <tom@curoverse.com>
Wed, 2 Dec 2015 21:56:40 +0000 (16:56 -0500)

Trivial merge