Merge branch 'trunk' of https://github.com/svmatthews/gdal into pdx2014

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

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