Merge branch 'master' into 'testing'

# Conflicts:
#   .gitlab-ci.yml
2 jobs for testing
in 2 seconds and was queued for 3 seconds