Merge branch 'master' into 'develop'

# Conflicts:
#   .gitlab-ci.yml
2 jobs for develop in 12 minutes and 29 seconds (queued for 9 seconds)
Status Name Job ID Coverage
  Windows
passed masterJobWindows #583931
Windows10

00:12:29

 
  Linux
failed BranchJobLinux #583932

 
Name Stage Failure
failed
BranchJobLinux Linux There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log