Spelling fix for error message.
Merge branch 'dev' into test