Merge branch 'nullmodels' of https://github.com/laanwj/bitcoin