Merge "Merge branch 'master' into v7.0" into v7.0
authorbeierlm <mark.beierl@canonical.com>
Fri, 22 May 2020 15:22:48 +0000 (17:22 +0200)
committerGerrit Code Review <root@osm.etsi.org>
Fri, 22 May 2020 15:22:48 +0000 (17:22 +0200)

Trivial merge