Merge branch 'master' of https://github.com/dashee-bot/dashee