Support game-specific minetest.conf
Merge remote-tracking branch 'upstream/master' into flolands