Merge remote-tracking branch 'origin/devel' into testing

URLs had to be adapted
1 job for testing in 8 seconds (queued for 1 second)