Fixed support for local tiles produced using gdal2tiles
Merge remote-tracking branch 'origin/master'