Merge branch 'fixes' into next
authorUlf Hansson <ulf.hansson@linaro.org>
Mon, 16 Jul 2018 09:58:21 +0000 (11:58 +0200)
committerUlf Hansson <ulf.hansson@linaro.org>
Mon, 16 Jul 2018 09:58:21 +0000 (11:58 +0200)

Trivial merge