- Better handling of some shape files
Merge remote-tracking branch 'origin/master'