CLIENT-61

Change-Id: I221cfc371d4313f2fcdcc7bb6066268508927cc9
Reviewed-on: http://gerrit.dmdirc.com/1532
Automatic-Compile: Greg Holmes <greg@dmdirc.com>
Reviewed-by: Greg Holmes <greg@dmdirc.com>

Change-Id: I96c3ad666c6a176d5289f47c02ba6a524ee34172
Reviewed-on: http://gerrit.dmdirc.com/1327
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>