Merge remote-tracking branch 'upstream/master' into Spiders!

Conflicts:
	data/json/overmap_terrain.json
	src/mapgen_functions.cpp
	src/mapgen_functions.h