Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 20 Apr 2019 15:35:54 +0000 (17:35 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 20 Apr 2019 15:35:54 +0000 (17:35 +0200)

Trivial merge