Merge from minetest_master
Merge branch 'master' of https://github.com/rubenwardy/capturetheflag