Merge pull request #6256
65b9454 Use best header chain timestamps to detect partitioning (Gavin Andresen)