Fixing typo in documentation
Merge branch 'master' into 2.3