Merge GDAL support to master

Merged pull request #2926 to master branch