Merge branch 'terencehill/bot_fix' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 31 Dec 2016 00:44:53 +0000 (00:44 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 31 Dec 2016 00:44:53 +0000 (00:44 +0000)
Bot fixes

See merge request !398


Trivial merge