Merge from Minetest_game 2
Merge from minetest_game 3