extra contains for testing against a geometry
Merge branch 'IlwisCore/master'