Merge pull request #1108 in master
Fix typo
Merge pull request #1110
Merge pull request #1110 in develop