Merge branch '9309-python-redundant-upload-wip'
authorBrett Smith <brett@curoverse.com>
Wed, 15 Jun 2016 15:30:17 +0000 (11:30 -0400)
committerBrett Smith <brett@curoverse.com>
Wed, 15 Jun 2016 15:30:17 +0000 (11:30 -0400)
Refs #9309.  Closes #9393.


Trivial merge