Merge branch 'testing' into 'master'

Github version to gitlab

See merge request !1
3 jobs for master in 2 minutes and 23 seconds (queued for 35 seconds)