Merge branch 'master' into 2449-keep-write-blocks
authorTim Pierce <twp@curoverse.com>
Sat, 12 Apr 2014 18:26:43 +0000 (14:26 -0400)
committerTim Pierce <twp@curoverse.com>
Sat, 12 Apr 2014 18:26:43 +0000 (14:26 -0400)

Trivial merge