Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 2 Nov 2018 15:16:22 +0000 (15:16 +0000)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 2 Nov 2018 15:16:22 +0000 (15:16 +0000)

Trivial merge