Issue 3943

Change-Id: I9f769f243178022528da65fe4c15abbd62d9e49c
Depends-On: I1419fa74d8da7f3f5d96a00dea559329db008b0e
Reviewed-on: http://gerrit.dmdirc.com/1046
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>
Automatic-Compile: Shane Mc Cormack <shane@dmdirc.com>

Change-Id: Icfb27b2dcfa9cd9ca122881c912878862cef3c90
Reviewed-on: http://gerrit.dmdirc.com/830
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Gregory Holmes <greg@dmdirc.com>