Merge branch '3118-docker-fixes'
authorWard Vandewege <ward@curoverse.com>
Mon, 30 Jun 2014 19:14:39 +0000 (15:14 -0400)
committerWard Vandewege <ward@curoverse.com>
Mon, 30 Jun 2014 19:14:39 +0000 (15:14 -0400)
refs #3118


Trivial merge