Merge branch 'version_3.1_prep' into 'master'

Preparing for version 3.1

See merge request !37
2 jobs for master in 1 minute and 5 seconds (queued for 3 seconds)