Merge... some random commits
Merge branch 'master' of http://github.com/Ombridride/minetest-minetestforfun-server