Correct a failing test after merge from trunk.
1 file changed