Merge branch '6638-python-backport-dependencies-wip'
authorBrett Smith <brett@curoverse.com>
Wed, 2 Sep 2015 13:52:06 +0000 (09:52 -0400)
committerBrett Smith <brett@curoverse.com>
Wed, 2 Sep 2015 13:52:29 +0000 (09:52 -0400)
Closes #6638.


Trivial merge