Merge pull request #4926
584a358 Do merkle root and txid duplicates check simultaneously (Pieter Wuille)