Merge branch 'irc_proxy' into development