WIP
Faster farmesh
Merge remote-tracking branch 'upstream/master' into farmesh4

Conflicts:
	src/clientmap.cpp
WIP
wip
wip