Merge branch 'hotfix/v1.3.1' into develop
Merge pull request #1 from klang/develop

Merge branch 'hotfix/v1.3.1' into develop