Merge remote-tracking branch 'origin/fix_dependencies'
Made OCGIS optional
Merge remote-tracking branch 'origin/ocgis_optional' into next