Merge remote-tracking branch 'origin/master' into addmainunit2
authorJan Kratochvil <jan.kratochvil@redhat.com>
Mon, 16 Nov 2020 08:15:29 +0000 (09:15 +0100)
committerJan Kratochvil <jan.kratochvil@redhat.com>
Mon, 16 Nov 2020 08:15:29 +0000 (09:15 +0100)

Trivial merge