Merge branch '6389-add-dockerfiles'
authorBrett Smith <brett@curoverse.com>
Wed, 8 Jul 2015 14:09:25 +0000 (10:09 -0400)
committerBrett Smith <brett@curoverse.com>
Wed, 8 Jul 2015 14:09:38 +0000 (10:09 -0400)
Closes #6389, #6456.


Trivial merge