Fixed #1065
Fixed #1065
Merge branch 'master' into refactor

Conflicts:
	entities/weapons/weapon_pumpshotgun2/shared.lua