Merge branch 'update_testing' into 'master'

Update testing

See merge request !21
1 job for master in 13 seconds (queued for 2 seconds)