Merge remote-tracking branch 'origin/master'

Conflicts:
	scripts/vscripts/addon_game_mode.lua