Merge branch 'fixes' into next
authorUlf Hansson <ulf.hansson@linaro.org>
Tue, 15 Jun 2021 15:27:38 +0000 (17:27 +0200)
committerUlf Hansson <ulf.hansson@linaro.org>
Tue, 15 Jun 2021 15:27:38 +0000 (17:27 +0200)

Trivial merge