GEOT-4367
GEOT-4367
Merge pull request #107 from simboss/GEOT-4367

Fix for GEOT-4367