Merge branch 'master' of https://github.com/sandos/bitcoin into sandos-master