Merge branch 'reorginfo' of https://github.com/sipa/bitcoin