CLIENT-61

Change-Id: I221cfc371d4313f2fcdcc7bb6066268508927cc9
Reviewed-on: http://gerrit.dmdirc.com/1532
Automatic-Compile: Greg Holmes <greg@dmdirc.com>
Reviewed-by: Greg Holmes <greg@dmdirc.com>

Change-Id: Ia5fb799a514aa47cbd3c407c42b3a149b147ae44
Reviewed-on: http://gerrit.dmdirc.com/1251
Automatic-Compile: Shane Mc Cormack <shane@dmdirc.com>
Reviewed-by: Shane Mc Cormack <shane@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>

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