Updates for 4.0 release / 2.1 postgis