Merge branch '2449-keep-index-status-handlers'
authorTim Pierce <twp@curoverse.com>
Wed, 16 Apr 2014 18:57:51 +0000 (14:57 -0400)
committerTim Pierce <twp@curoverse.com>
Wed, 16 Apr 2014 18:57:51 +0000 (14:57 -0400)
Closes #2449, closes #2603, closes #2561.


Trivial merge