Merge branch 'fixes' into next
authorUlf Hansson <ulf.hansson@linaro.org>
Thu, 15 Mar 2018 13:43:28 +0000 (14:43 +0100)
committerUlf Hansson <ulf.hansson@linaro.org>
Thu, 15 Mar 2018 13:43:28 +0000 (14:43 +0100)

Trivial merge