Merge branch 'hotfix/1.3.1'
Merge branch 'master' into develop

* master: