Merge branch 'master' into 2449-keep-write-blocks
authorTim Pierce <twp@curoverse.com>
Fri, 11 Apr 2014 17:33:05 +0000 (13:33 -0400)
committerTim Pierce <twp@curoverse.com>
Fri, 11 Apr 2014 17:33:05 +0000 (13:33 -0400)

Trivial merge