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>

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

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