Reverted r18916 as this was committed with the wrong commit message!
The command used was: svn merge -r18916:18915 .
Authored by: bugman 2013-03-20
Parent: [r18916]
Child: [r18918]