Merge branch waiting_for_jobs_in_threads with refs/heads/master into refs/merge-requests/113/train

3 jobs for !113 with waiting_for_jobs_in_threads into master in 2 minutes and 46 seconds (queued for 2 seconds)
merge train