Fix the load of external Tileset
Merge remote-tracking branch 'upstream/master'