Merge branch 'master' into 'patch-1'

# Conflicts:
#   preparemoodle.py
Status Job ID Name Coverage
  Build Docker
failed #1190963
build

 
  Test
skipped #1190964
test
 
Name Stage Failure
failed
build Build Docker There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log