Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 3 Apr 2019 21:53:22 +0000 (21:53 +0000)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 3 Apr 2019 21:53:22 +0000 (21:53 +0000)

Trivial merge