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>

Fixes issue 3546

Change-Id: Ie5b334869fe0fd5f90d049393e51007f77f2c89a
Reviewed-on: http://gerrit.dmdirc.com/544
Automatic-Compile: Gregory Holmes <greboid@dmdirc.com>
Reviewed-by: Gregory Holmes <greboid@dmdirc.com>

Change-Id: Ie8fe55536d320ab50472d8090b63c701cc4b12ba
Reviewed-on: http://gerrit.dmdirc.com/230
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>
Tested-by: Shane Mc Cormack <shane@dmdirc.com>