Merge branch 'minetest_game/master'