Merge branch '8406-tempfail-after-retry-unlocked'
authorBrett Smith <brett@curoverse.com>
Tue, 9 Feb 2016 21:42:59 +0000 (16:42 -0500)
committerBrett Smith <brett@curoverse.com>
Tue, 9 Feb 2016 21:42:59 +0000 (16:42 -0500)
Closes #8406, #8407.


Trivial merge