Merge ck (0.6.0-1.4) import into refs/heads/workingbranch
authorJCF Ploemen (jcfp) <linux@jcf.pm>
Sat, 4 Apr 2020 05:20:03 +0000 (06:20 +0100)
committerJCF Ploemen (jcfp) <linux@jcf.pm>
Sat, 4 Apr 2020 05:20:03 +0000 (06:20 +0100)

Trivial merge