Merge branch '6035-docker-upload-option'
authorNico Cesar <nico@nicocesar.com>
Fri, 22 May 2015 19:32:41 +0000 (15:32 -0400)
committerNico Cesar <nico@nicocesar.com>
Fri, 22 May 2015 19:32:41 +0000 (15:32 -0400)
closes #6035


Trivial merge