Refs #4877 Small language tweaks
Merge remote-tracking branch 'origin/master'