turns out we dont need this explicitly
Merge branch 'devel' into mod_irc