Merge pull request #707 from gavinandresen/BIP14