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