fixed minor spelling error
Merge branch 'master' into dev/2.6.x