Merge branch 'develop' into release-3.3.1
Bump version to 3.3.1. Add CHANGELOG file
Merge branch 'release-3.3.1'
Merge branch 'master' into develop