Merge remote-tracking branch 'remotes/origin/add-trigger.is_privmsg' into whouya-bot
Merge remote-tracking branch 'remotes/origin/adminchannel-accept-commands-from-pm' into whouya-bot
Merge remote-tracking branch 'remotes/origin/db-create-table-errors-on-column-tuples' into whouya-bot