Merge branch 'release/3.0.2' into devel
Bump to version 3.1.0
Merge branch 'release/3.1'