Made slightly more generic
Merge remote-tracking branch 'origin/Tiled-2.0' into Tiled-2.0
Pushing this so that Andrew can fix my crap