refs #2385update language
Merge branch 'release/1.12'