Reverted r24718 as this was rubbish.
The command used was: svn merge -r24718:24717 .
Authored by: bugman 2014-07-24
Parent: [r24719]
Child: [r24721]