changes pulled in from bitcoinbuilder2