Merge branch '10211-double-close-crash' closes #10211
authorTom Clegg <tom@curoverse.com>
Mon, 17 Oct 2016 12:50:57 +0000 (08:50 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 17 Oct 2016 12:50:57 +0000 (08:50 -0400)

Trivial merge