Merge remote-tracking branch 'origin/master'

# Conflicts:
#	startup.py
Status Job ID Name Coverage
  Build
failed #2792
build

 
  Test
skipped #2794
allowed to fail
code_quality
skipped #2793
test
 
Name Stage Failure
failed
build Build There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job trace