Pull master into hotfix

For correcting spelling errors