https://github.com/bitcoin/bitcoin/pull/506 has been closed pending
additional commits or a change in consensus.