should fix #6065
Fixes #6054
Merge pull request #6066 from Walter0o/patch-1

should fix #6065
Merge pull request #6068 from faerindel/vending_exploit_fix

Fixes #6054
Merge pull request #1 from Baystation12/master

merge!