Fixing spelling mistake

Merging master to branch 2.1