adding postgis changes that were lost in merge