fix typo refs #5175
Merge remote-tracking branch 'origin/master'