1.1.2dev: merge changes from [11757:11778/branches/1.0-stable]

... leaving the l10n ones for another day.


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