merged upstreamed - to fix sync
merged upstreamed - to fix sync

USGS-Astrogeology/GDAL_scripts,USGS-Astrogeology/GDAL_scripts,thareUSGS/GDAL_scripts,thareUSGS/GDAL_scripts,USGS-Astrogeology/GDAL_scripts,thareUSGS/GDAL_scripts,thareUSGS/GDAL_scripts,USGS-Astrogeology/GDAL_scripts