Merge branch 'master' of https://github.com/minetest/minetest

diff --cc LICENSE.txt
Simple merge

diff --cc builtin/mainmenu/dlg_contentstore.lua
Simple merge

diff --cc builtin/mainmenu/pkgmgr.lua
Simple merge

diff --cc builtin/settingtypes.txt
Simple merge

diff --cc doc/lua_api.txt
Simple merge

diff --cc src/client/camera.cpp
Simple merge

diff --cc src/client/camera.h
Simple merge

diff --cc src/client/client.cpp
Simple merge

diff --cc src/client/clientenvironment.cpp
Simple merge

diff --cc src/client/clientmap.cpp
Simple merge

diff --cc src/client/content_cao.cpp
Simple merge

diff --cc src/client/mapblock_mesh.cpp
Simple merge

diff --cc src/client/mapblock_mesh.h
Simple merge

diff --cc src/defaultsettings.cpp
Simple merge

diff --cc src/gui/guiKeyChangeMenu.cpp
Simple merge

diff --cc src/script/lua_api/l_mainmenu.cpp
Simple merge

diff --cc src/unittest/test.cpp
Simple merge

diff --cc util/buildbot/buildwin32.sh
Simple merge

diff --cc util/buildbot/buildwin64.sh
Simple merge