Update IRC parsing to avoid errors

IRC parsing looked at the entire line, which could cause errors
Merge remote-tracking branch 'upstream/master'