Merge pull request #5900
3fcfbc8 Add a consistency check for the block chain data structures (Pieter Wuille)