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