Merge branch 'master' into 2449-keep-write-blocks
authorTim Pierce <twp@curoverse.com>
Thu, 10 Apr 2014 20:34:45 +0000 (16:34 -0400)
committerTim Pierce <twp@curoverse.com>
Thu, 10 Apr 2014 20:34:45 +0000 (16:34 -0400)

Trivial merge