1.1.3dev: Merged [13648] from 1.0-stable.
1.1.3dev: Merged [13648] from 1.0-stable.


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

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