Sync with last postgis revision (r11093)
Add diff file
Clean a bit