Merge remote branch 'origin/master'

.gitignore

CMakeLists.txt

README.txt

builtin/builtin.lua

builtin/item.lua

builtin/item_entity.lua

cmake/Modules/FindJson.cmake

doc/lua_api.txt

doc/protocol.txt

fonts/liberationmono.ttf

fonts/liberationsans.ttf

games/minimal/mods/default/mapgen.lua

minetest.conf.example

old/changelog.txt

src/CMakeLists.txt

src/activeobject.h

src/ban.cpp

src/ban.h

src/base64.h

src/biome.cpp