Remove old dout from map
Merge remote-tracking branch 'upstream/master' into lock

Conflicts:
	src/map.cpp
	src/map.h