Fold in dmd-testsuite merge conflict fix.