Merge master into 4.3.4

Conflicts:
	Chat.h
	World.cpp
	World.h