1.1.6dev: merged [14118] from 1.0-stable (refs #12113)
1.1.6dev: merged [14118] from 1.0-stable (refs #12113)


git-svn-id: 0d96b0c1a6983ccc08b3732614f4d6bfcf9cbb42@14119 af82e41b-90c4-0310-8c96-b1721e28e2e2

rbaumg/trac,rbaumg/trac,rbaumg/trac,rbaumg/trac