merge from minetest master 20131223