1.1.5dev: Fixed merge error in [13967].
1.1.5dev: Fixed merge error in [13967].


git-svn-id: eda3d06fcef731589ace1b284159cead3416df9b@13968 af82e41b-90c4-0310-8c96-b1721e28e2e2

walty8/trac,walty8/trac,walty8/trac,walty8/trac