0.12.8dev: Correct bad merge in [14795]
0.12.8dev: Correct bad merge in [14795]

Refs #12475.


git-svn-id: 764b04d0c6fbbea0ee05220aef3208173ff13049@14803 af82e41b-90c4-0310-8c96-b1721e28e2e2

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