Fixes issue 3168
Fixes issue 3347

Change-Id: I7722fe396e58f37cc60d10f54bb3a68ab63dbe7b
Reviewed-on: http://gerrit.dmdirc.com/358
Reviewed-by: Gregory Holmes <greboid@dmdirc.com>
Tested-by: Gregory Holmes <greboid@dmdirc.com>

Change-Id: I3afb4ec125fff7e02bc51296c5546a376fb99b55
Reviewed-on: http://gerrit.dmdirc.com/270
Reviewed-by: Chris Smith <chris@dmdirc.com>
Tested-by: Gregory Holmes <greboid@dmdirc.com>
Reviewed-by: Gregory Holmes <greboid@dmdirc.com>

Change-Id: I9ce55688263e8e016046296bd366a4d6936a41f1
Reviewed-on: http://gerrit.dmdirc.com/234
Reviewed-by: Gregory Holmes <greboid@dmdirc.com>
Tested-by: Gregory Holmes <greboid@dmdirc.com>