Merge branch 'master' into rc3.1

# Conflicts:
#	.gitlab-ci.yml
7 jobs for rc3.1 in 44 minutes and 28 seconds (queued for 16 minutes and 18 seconds)
latest