Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 7 Dec 2018 20:06:45 +0000 (21:06 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 7 Dec 2018 20:06:45 +0000 (21:06 +0100)

Trivial merge