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