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