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