Merge branch '9242-python-backport-prefix-wip'
authorBrett Smith <brett@curoverse.com>
Tue, 31 May 2016 20:09:57 +0000 (16:09 -0400)
committerBrett Smith <brett@curoverse.com>
Tue, 31 May 2016 20:09:57 +0000 (16:09 -0400)
Closes #9242, #9247.


Trivial merge