Commit 08004d4e authored by Benjamin Otte's avatar Benjamin Otte

Merge branch 'wip/otte/for-master' into 'master'

Wip/otte/for master

Closes #3295

See merge request !2748
parents 6d5c5125 6d7e56be
Pipeline #224892 passed with stages
in 21 minutes and 45 seconds