Merge branch 'hotfix/1.1.2' into develop
Some errors corrected
Merge branch 'release/1.2' into gh-pages