Merge branch 'master' into stable

Conflicts:
	addons/sourcemod/scripting/freak_fortress_2.sp
	addons/sourcemod/scripting/freaks/default_abilities.sp
	addons/sourcemod/scripting/freaks/ff2_1st_set_abilities.sp
	update.txt