Merge branch '11546-fast-lock'
authorTom Clegg <tom@curoverse.com>
Wed, 17 May 2017 20:47:20 +0000 (16:47 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 17 May 2017 20:47:20 +0000 (16:47 -0400)
closes #11546


Trivial merge