Merge branch 'hot-fix-1.1.1'
A little modification
Merge branch 'master' into develop