Merge branch 'upstream/master'

CMakeLists.txt

src/client.cpp

src/clientserver.h

src/content_cao.h

src/content_inventory.cpp

src/content_inventory.h

src/content_nodemeta.cpp

src/content_sao.cpp

src/content_sao.h

src/defaultsettings.cpp

src/environment.cpp

src/game.cpp

src/game.h

src/guiKeyChangeMenu.cpp

src/guiKeyChangeMenu.h

src/guiPauseMenu.cpp

src/inventory.cpp

src/inventory.h

src/main.cpp

src/server.cpp