Reverted r20075 as the wrong files were committed!
The command used was: svn merge -r20075:20074 .
Authored by: bugman 2013-06-12
Parent: [r20075]
Child: [r20077]
