Commit 36e6c456 authored by Carsten  Rose's avatar Carsten Rose

Merge branch 'ManualMergeIndex' into 'master'

Manual merge index

See merge request !242
parents cdc0df99 dd99a446
Pipeline #3143 passed with stages
in 1 minute and 56 seconds