Merge remote branch 'origin/master'

minetest.conf.example

src/biome.cpp

src/defaultsettings.cpp

src/map.cpp

src/mapgen.cpp

src/mapgen.h

src/mapgen_v6.cpp

src/noise.cpp

src/porting.cpp

src/porting.h

src/scriptapi.cpp

src/settings.h

src/util/string.cpp

src/util/string.h