Fixes issue 4121

Depends-On: I857570b97afaeca11f89d12c372bd9464732670c
Change-Id: I444916cc93dbf939d1a8405f4fc85c125b849f08
Reviewed-on: http://gerrit.dmdirc.com/1266
Automatic-Compile: Gregory Holmes <greg@dmdirc.com>
Reviewed-by: Gregory Holmes <greg@dmdirc.com>

See corresponding core change for full details.

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