1.2.3dev: merge [16400] from 1.0-stable
1.2.3dev: merge [16400] from 1.0-stable


git-svn-id: 68cfa85dc440743b03ced815f1f2f5f2381a3d7a@16401 af82e41b-90c4-0310-8c96-b1721e28e2e2

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