Commit 03c9b78c authored by Carsten Gräser's avatar Carsten Gräser

Merge branch 'feature/make-2.6-compatible' into 'releases/2.6'

Patch releases/2.6 branch to work with 2.6 releases

See merge request !178
parents 5afbd874 3f5837f9
Pipeline #10185 passed with stage
in 11 minutes and 5 seconds