Merge from TenPlus1, packaged by Wuzzy

From
https://forum.minetest.net/viewtopic.php?p=157958#p150768
https://forum.minetest.net/viewtopic.php?p=157958#p157958