Merge branch 'master' into develop
Fix wrong english
Merge remote-tracking branch 'origin' into develop