Follow-up to r3339, taking into account r3241... Thanks cmlenz for being vigilant :)
Follow-up to r3339, taking into account r3241... Thanks cmlenz for being vigilant :)

git-svn-id: 0d96b0c1a6983ccc08b3732614f4d6bfcf9cbb42@3341 af82e41b-90c4-0310-8c96-b1721e28e2e2

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