merge with osgeo/gdal/trunk