[pull] master from OSGeo:master #105
+12
−6
Merged
Loading