tmpFix
Fix for merge shared geom and objectspace
Merge pull request #594 from JohnBrookes/MergeFix

Merge fix