1.0.11dev: Merge [14717,14718] from 1.0-stable
1.0.11dev: Merge [14717,14718] from 1.0-stable

Refs #12451.


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

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