Merge branch '3115-keep-disk-create-surprise'
authorTom Clegg <tom@curoverse.com>
Tue, 7 Mar 2017 20:39:36 +0000 (15:39 -0500)
committerTom Clegg <tom@curoverse.com>
Tue, 7 Mar 2017 20:39:36 +0000 (15:39 -0500)
closes #3115


Trivial merge