Fixed a couple small spelling errors.
Merge branch 'dev' into test