issue 2643 issue 3238 Change-Id: I8d97dcefa69ea25d85306d3f5035f568b4b8b4fe Reviewed-on: http://gerrit.dmdirc.com/392 Reviewed-by: Chris Smith <chris@dmdirc.com> Tested-by: Chris Smith <chris@dmdirc.com>