Fix null dereference in weather update functions
Merge remote-tracking branch 'upstream/master' into weather

Conflicts:
	src/map.cpp