Merge from minetest_game