1.3.2dev: Merge r16163 from 1.2-stable
1.3.2dev: Merge r16163 from 1.2-stable

Refs #11846.


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

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