Merge branch 'fixes' into next

This commit is contained in:
Ulf Hansson 2018-03-21 11:11:30 +01:00
commit c42e8e054d