Merge branch 'patch-7' of https://github.com/spatialguru/gdal into patch-7

From: Even Rouault <even.rouault@mines-paris.org>

git-svn-id: https://svn.osgeo.org/gdal/trunk@26567 f0d54148-0727-0410-94bb-9a71ac55c965
Minor adjustments to gdal_utilities.dox

From: Even Rouault <even.rouault@mines-paris.org>

git-svn-id: https://svn.osgeo.org/gdal/trunk@26568 f0d54148-0727-0410-94bb-9a71ac55c965
Merge branch 'trunk' into trunk_travis_macosx