Merge branch 'fixes' into next

This commit is contained in:
Ulf Hansson 2018-03-16 10:06:19 +01:00
commit f09a7931bc