1.1.3dev: Merged [13364] from 1.0-stable. Refs #10984, #11804.


git-svn-id: http://trac.edgewall.org/intertrac/log:/trunk@13365 af82e41b-90c4-0310-8c96-b1721e28e2e2