Merge branch 'master' into 'test1'

# Conflicts:
#   file1.txt
1 job for test1 in 2 seconds (queued for 4 seconds)
Status Name Job ID Coverage
  Test
passed job1 #76
demo

00:00:02