Fixes issue 4146

Change-Id: I1bfbf9356f21ebed5a7adc0c8e0a1d3a8d3ad300
Reviewed-on: http://gerrit.dmdirc.com/1242
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>

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

Change-Id: I0c42a673cbd066e8efcf1d7db4e310ef39794631
Reviewed-on: http://gerrit.dmdirc.com/833
Automatic-Compile: Gregory Holmes <greg@dmdirc.com>
Reviewed-by: Gregory Holmes <greg@dmdirc.com>