Merge pull request #998 from annando/bot-update