Reverted the last revision (r18737) as it was not correct and RelaxErrors should be used instead.
The command used was: svn merge -r18737:18736 .
Authored by: bugman 2013-03-10
Parent: [r18737]
Child: [r18739]
