Merge branch 'release/3.2.1' into develop
Update test tools
Fix travis
Update tests
comb code
Update version
Merge branch 'release/3.2.3'