Merge branch 'subcent-change' of https://github.com/tcatm/bitcoin