Merge branch 'semaphores-v0.6.2' of https://github.com/sipa/bitcoin into 0.6.2