fixing a typo in an error message
Merge branch 'master' into extend