Merge branch 'fixes' into next

This commit is contained in:
Ulf Hansson 2018-01-15 13:53:10 +01:00
commit 7ad43a1498