Merging kcalutils release/20.04 onto master

[Glen Ditchfield]

On Thursday, May 28, 2020 12:01:55 P.M. CDT Glen Ditchfield wrote:
> I think I've made a mess ...  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?

Checking more carefully, I think things are OK. My change and Laurent's are 
both present in master's head, so I think it's best left as-is.