Merge branch '3147-py-collection-retries-wip2'
authorBrett Smith <brett@curoverse.com>
Thu, 18 Sep 2014 19:56:28 +0000 (15:56 -0400)
committerBrett Smith <brett@curoverse.com>
Thu, 18 Sep 2014 19:56:49 +0000 (15:56 -0400)
Closes #3147.


Trivial merge