Merge branch '2449-keep-write-blocks'
authorTim Pierce <twp@curoverse.com>
Mon, 14 Apr 2014 20:39:52 +0000 (16:39 -0400)
committerTim Pierce <twp@curoverse.com>
Mon, 14 Apr 2014 20:39:52 +0000 (16:39 -0400)
Closes #2449, closes #2292, closes #2507.


Trivial merge