Bump to version 3.0.2
Update changelog
Merge branch 'release-3.0.2' into develop