Merge branch 'fixes' into next
authorUlf Hansson <[email protected]>
Mon, 30 Oct 2017 10:37:50 +0000 (11:37 +0100)
committerUlf Hansson <[email protected]>
Mon, 30 Oct 2017 10:37:50 +0000 (11:37 +0100)

Trivial merge