fix small typo
Merge branch 'master' into release-2.0