adaptation for multigeometries
Merge branch 'IlwisCore/master'