Merge branch '3720-big-manifest-performance-wip'
authorBrett Smith <brett@curoverse.com>
Fri, 5 Sep 2014 15:39:28 +0000 (11:39 -0400)
committerBrett Smith <brett@curoverse.com>
Fri, 5 Sep 2014 15:39:43 +0000 (11:39 -0400)
Closes #3720, #3806.


Trivial merge