1.2dev: merge [14685] from 1.0-stable (refs #6998)
1.2dev: merge [14685] from 1.0-stable (refs #6998)


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

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