Commit 7b3ae5ffd202346cb3742fe0f8cfafe8c36a4bd5

Behdad Esfahbod 2018-10-04T16:36:42

More bot fixes