Merge branch '2099-CORRECT-docker-stop-and-restart'
authorTim Pierce <twp@curoverse.com>
Wed, 12 Feb 2014 19:59:14 +0000 (14:59 -0500)
committerTim Pierce <twp@curoverse.com>
Wed, 12 Feb 2014 19:59:14 +0000 (14:59 -0500)

Trivial merge