refs #3053

propagated to 3.1.6
Merge pull request #3635 from shovtyuk/3.1.0-stable

refs #3053