refs #2684
Merge branch 'release/4.1.4'