Merge remote-tracking branch 'refs/remotes/origin/2755-python-sdk-permissions-TC...
authorTim Pierce <twp@curoverse.com>
Fri, 30 May 2014 18:42:03 +0000 (14:42 -0400)
committerTim Pierce <twp@curoverse.com>
Fri, 30 May 2014 18:42:03 +0000 (14:42 -0400)
Refs #2755.


Trivial merge