Merge branch 'master' into 2449-keep-write-blocks
authorTim Pierce <twp@curoverse.com>
Tue, 8 Apr 2014 18:11:24 +0000 (14:11 -0400)
committerTim Pierce <twp@curoverse.com>
Tue, 8 Apr 2014 18:11:24 +0000 (14:11 -0400)

Trivial merge