Merge pull request #1055 in master
Fix typo
Merge pull request #1057
Merge pull request #1057 in develop