Increased timeout for small tests.
Bumped version and updated changelog.
Merge branch 'release/1.3.1' into develop