Typo
Merge pull request #1629 from zyegfryed/patch-1

Typo
Merge branch 'master' into 3.1