Merge of esri/geometry and mraad/shapefile with changes and additions