Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.gitlab-ci.yml
2 jobs for master in 25 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Configure
passed #96726
linux
configure-linux

00:00:01

 
  Compile
passed #96727
linux
make-linux

00:00:23