Merge branch 'fixes' into next
authorUlf Hansson <ulf.hansson@linaro.org>
Mon, 11 Dec 2017 12:56:08 +0000 (13:56 +0100)
committerUlf Hansson <ulf.hansson@linaro.org>
Mon, 11 Dec 2017 12:56:08 +0000 (13:56 +0100)

Trivial merge