Reverted r26820 as this was incorrect.
The command used was: svn merge -r26820:r26819 .
Authored by: bugman 2014-11-29
Parent: [r26821]
Child: [r26823]