fixes issue 4155

Change-Id: I26fcb0b617339e3db81bef0836436c4920d57f4f
Reviewed-on: http://gerrit.dmdirc.com/1263
Reviewed-by: Gregory Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>

Fixes issue 3102

Change-Id: I5d41eddc174a63db1bd301f1cb757d21ef840126
Reviewed-on: http://gerrit.dmdirc.com/386
Reviewed-by: Gregory Holmes <greboid@dmdirc.com>
Tested-by: Gregory Holmes <greboid@dmdirc.com>

Change-Id: I5eb65ec17afb299e231d061c48ba5cfd4eb1ecb6
Reviewed-on: http://gerrit.dmdirc.com/280
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>
Tested-by: Gregory Holmes <greboid@dmdirc.com>