Merge branch 'trunk' into trunk_with_coverage
Merge branch 'trunk_with_coverage' of github.com:rouault/gdal_coverage into trunk_with_coverage