Merge pull request #1052 from sipa/scopedlocks