Merge branch 'master' into 1844-blob-signature
authorTom Clegg <tom@curoverse.com>
Fri, 7 Mar 2014 20:02:00 +0000 (15:02 -0500)
committerTom Clegg <tom@curoverse.com>
Fri, 7 Mar 2014 20:02:00 +0000 (15:02 -0500)

Trivial merge