gdal: updates from main tap