Merge branch 'fixes' into next
authorUlf Hansson <ulf.hansson@linaro.org>
Mon, 17 Jun 2019 11:28:12 +0000 (13:28 +0200)
committerUlf Hansson <ulf.hansson@linaro.org>
Mon, 17 Jun 2019 11:28:12 +0000 (13:28 +0200)

Trivial merge