Fixed #904
Fixed #906
Merge branch 'master' into refactor

Conflicts:
	gamemode/config/config.lua