thanks laanwj, i moved the CheckBlock change into its own pull request now. https://github.com/bitcoin/bitcoin/pull/3311