Merge branch 'fixes' into next

This commit is contained in:
Ulf Hansson 2017-10-30 11:37:50 +01:00
commit faf73fa17c
2 changed files with 23 additions and 7 deletions