Merge branch 'release/1.3.0' into develop
Fix bug.
Update version.
Merge branch 'release/1.3.1'