Merge branch '6388-python-backports-wip'
authorBrett Smith <brett@curoverse.com>
Thu, 25 Jun 2015 19:33:01 +0000 (15:33 -0400)
committerBrett Smith <brett@curoverse.com>
Thu, 25 Jun 2015 19:33:12 +0000 (15:33 -0400)
Refs #6388.  Closes #6425.


Trivial merge