Merge branch 'master' into pan_map

Conflicts:
	src/map/mapengine.h

diff --cc src/map/mapengine.cpp
Simple merge

diff --cc src/map/mapengine.h
Simple merge

diff --cc src/map/mapfetcher.cpp
Simple merge