Merge branch 'master' of github.com:OSGeo/gdal

* 'master' of github.com:OSGeo/gdal:
  JPEG2000 drivers: use modern Get/SetSpatialRef() API. No functional change
  GTiff: rework signature of GTIFSetFromOGISDefnEx() for future change. No functional change
  /vsiswift/: Fix openstack swift endpoint detection, add application_credential authentication support (OSGeo#3960)
  RFC83: update status as adopted
  tiff_write.py: fix deletion of temp files on Windows
  COG: don't crash if GDALCreateGenImgProjTransformer2() fails
  Shapefile: fix wrong SRS when reading a WGS 84 SRS with a TOWGS84[0,0,0,0,0,0,0] (fixes OSGeo#3958)
  rfc83: add note on which input is taken into account
  rfc83: use gender neutral terms
  rfc83: other typo fixes
  rfc83: other typo fixes
  Take into account mloskot's suggestions
  Typos
  Add RFC 83: guidelines for the use of GDAL project sponsorship

doc/source/development/rfc/index.rst

@@ -93,6 +93,7 @@ RFC list
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8fc61d7286 (Merge branch 'master' of github.com:OSGeo/gdal)
 =======
@@ -119,6 +120,8 @@ RFC list
 >>>>>>> b1792c641a (Merge branch 'master' of github.com:OSGeo/gdal):gdal/doc/source/development/rfc/index.rst
 >>>>>>> 4a3a424d06 (Merge branch 'master' of github.com:OSGeo/gdal)
 >>>>>>> d9b2222466 (Merge branch 'master' of github.com:OSGeo/gdal)
+=======
+>>>>>>> b7187c72cc (Merge branch 'master' of github.com:OSGeo/gdal)
     rfc81_coordinate_epoch
     rfc83_use_of_project_sponsorship
     rfc84_cmake