Re-commit some changes that were lost in the rollback. Refs #7159 !strict
Re-commit some changes that were lost in the rollback. Refs #7159 !strict

git-svn-id: 674a2d6b1e32e53f607eb824547723f32280967e@15982 560b804f-0ae3-0310-86f3-f6aa0a117693

redaktor/deliteful