small typo fix
Merge branch 'master' into mcarthur
Merge branch 'master' into mcarthur