Commit 158e0534 authored by Martin Nolte's avatar Martin Nolte

Merge branch 'cherry-pick-d48b9b64' into 'releases/2.6'

Merge branch 'feature/require-cmake-3.1' into 'master'

See merge request !259
parents 2ca6a2d5 e6cf2863
Pipeline #6614 passed with stage
in 52 minutes and 36 seconds