Fix a typo
Merge branch 'release-1.0'