Merge remote-tracking branch 'origin/master'

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

00:00:01

 
  Compile
passed make-linux #96727
linux

00:00:23