Commit 3c9a64cf authored by Patric Schmitz's avatar Patric Schmitz

Merge remote-tracking branch 'origin/master' into cmake-overhaul

preparing merge into master
parents baa9ad84 16189854
Pipeline #12794 passed with stages
in 7 minutes and 43 seconds