Commit a41c72e4 authored by Martin Nolte's avatar Martin Nolte

Merge branch 'cherry-pick-1a5b10cf' into 'releases/2.6'

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

See merge request !24
parents 6c67ed68 5c6bbbf9
Pipeline #7155 passed with stage
in 46 minutes and 57 seconds