Reverted commit r22272 as too much was committed.
The command used was: svn merge -r22272:22271 .
Authored by: bugman 2014-02-24
Parent: [r22272]
Child: [r22274]