Merge branch '10468-blob-storage-timeouts' closes #10468
authorTom Clegg <tom@curoverse.com>
Mon, 7 Nov 2016 22:43:17 +0000 (17:43 -0500)
committerTom Clegg <tom@curoverse.com>
Mon, 7 Nov 2016 22:43:17 +0000 (17:43 -0500)

Trivial merge