Merge branch 'fixes' into next

This commit is contained in:
Ulf Hansson 2017-12-11 13:56:08 +01:00
commit e828b53afd
2 changed files with 10 additions and 0 deletions