Merge branch '6497-separate-package-upload-wip'
authorBrett Smith <brett@curoverse.com>
Wed, 22 Jul 2015 20:38:33 +0000 (16:38 -0400)
committerBrett Smith <brett@curoverse.com>
Wed, 22 Jul 2015 20:39:03 +0000 (16:39 -0400)
Closes #6497, #6533, #6498.


Trivial merge