Merge commit 'cassidy/irc'