Merge branch '6-random-failures' into 'master'

Made error messages more precise (doesn't solve the issue, though)

See merge request !8
19 jobs for master in 13 minutes and 24 seconds (queued for 6 seconds)