Fixes some bugs with security bots and vending machines
Merge remote-tracking branch 'origin/master'