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