Merging the gdal/nodata change from the "master_ar" branch