Split too long updateDrawList
Merge remote-tracking branch 'upstream/master' into lock

Conflicts:
	src/clientmap.cpp
	src/clientmap.h