V67+: Merge branch 'guymcswain-keepalive'
authorjoan <joan@abyz.me.uk>
Sun, 21 Oct 2018 08:29:11 +0000 (09:29 +0100)
committerjoan <joan@abyz.me.uk>
Sun, 21 Oct 2018 08:29:11 +0000 (09:29 +0100)

Trivial merge