Fixes issue 3588 Issue 3589 Depends-On: I8db9f60494939f6581dfc2a5fc8bf8b2d216c580 Change-Id: I595bd3e7ffc62ef7f059ae53beb8d6957c22c541 Reviewed-on: http://gerrit.dmdirc.com/1060 Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com> Reviewed-by: Gregory Holmes <greg@dmdirc.com>