Merge "Merge branch 'master' into v7.0" into v7.0 v7.1.0rc5
authorbeierlm <mark.beierl@canonical.com>
Thu, 28 May 2020 16:26:40 +0000 (18:26 +0200)
committerGerrit Code Review <root@osm.etsi.org>
Thu, 28 May 2020 16:26:40 +0000 (18:26 +0200)

Trivial merge