Reverted r26467 as too much was committed.
The command used was: svn merge -r26467:r26466 .
Authored by: bugman 2014-11-09
Parent: [r26467]
Child: [r26469]