Revert "Revert "Merge pull request #1323 from delanne/IRCContact""

This reverts commit c203010282e3651673f98540b88c7302c7b71082.
Merge pull request #1333 from delanne/FixBadRevert

Revert "Revert "Merge pull request #1323 from delanne/IRCContact""