11097: Merge branch 'master' into 11097-reuse-impure
authorTom Clegg <tom@curoverse.com>
Mon, 20 Feb 2017 20:34:15 +0000 (15:34 -0500)
committerTom Clegg <tom@curoverse.com>
Mon, 20 Feb 2017 20:34:15 +0000 (15:34 -0500)

Trivial merge