Fix for bots breaking if they fail to path
Merge remote-tracking branch 'upstream/dev' into dev
Merge pull request #3355 from softmix/dev

Fix for bots breaking if they fail to path