Merge remote branch 'origin/master'

CMakeLists.txt

builtin/chatcommands.lua

po/ky/minetest.po

src/main.cpp

src/mapgen_v6.cpp

src/nodedef.cpp

src/nodedef.h

src/scriptapi.cpp