1.0.2dev: merge [12317-12318] from 0.12-stable
1.0.2dev: merge [12317-12318] from 0.12-stable


git-svn-id: 50cd48c816abc7a9f40e8e03a4277466cb30a3e4@12319 af82e41b-90c4-0310-8c96-b1721e28e2e2

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