Merge branch 'stresstest' into 'master'

Stresstest

See merge request !14
5 jobs for master
in 4 minutes and 7 seconds and was queued for 2 seconds