Reverted r21065 as too much was committed.
The command used was: svn merge -r21065:21064 .
Authored by: bugman 2013-10-11
Parent: [r21065]
Child: [r21067]