Fix more stuff
Move around patches just a bit more
Upstream merge
Add support for EventType.action detection to irc