Fixes #7301
Merge pull request #7302 from Zuhayr/master

Fixes #7301, merge ASAP
Merge remote-tracking branch 'upstream/master' into dev-freeze

Conflicts:
	code/game/machinery/portable_turret.dm
Merge pull request #7305 from PsiOmegaDelta/dev-freeze

Dev freeze