Merge branch 'master' of https://github.com/shoebot/shoebot

latest commit 19a5fc0b50
Stuart Axon stuaxo authored