1.1.3dev: Fixed unresolved merge conflict from [13498]. Refs #11548.


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