Sync with upstream and enable PostGIS for 9.3