typo
Merge pull request #1219
Merge pull request #1219 in master