Merge branch '2879-docker-image-installer'
authorBrett Smith <brett@curoverse.com>
Thu, 12 Jun 2014 19:45:36 +0000 (15:45 -0400)
committerBrett Smith <brett@curoverse.com>
Thu, 12 Jun 2014 19:46:09 +0000 (15:46 -0400)
Refs #2879.  Closes #2998, #3006.


Trivial merge