Merge branch 'fixes' into next
authorUlf Hansson <ulf.hansson@linaro.org>
Fri, 9 Oct 2020 06:58:30 +0000 (08:58 +0200)
committerUlf Hansson <ulf.hansson@linaro.org>
Fri, 9 Oct 2020 06:58:30 +0000 (08:58 +0200)

Trivial merge