Merging kcalutils release/20.04 onto master

[Glen Ditchfield]

I think I've made a mess.   Yesterday I created merge request
!4 while exploring but I did not merge it.  Just now I found a problem with 
~/.gitconfig, fixed it, and did a push to master, but somehow !4 got merged as 
well.  I don't know how that happened.

The repository graph on Gitlab is a tangle, and I think Laurent's last commit 
was overwritten.

Should I (or someone with experience!) revert !4?