Reverted r18237 as the fix was no correct!
The command used was: svn merge -r18237:18236 .
Authored by: bugman 2013-01-18
Parent: [r18237]
Child: [r18239]