Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 22 Jun 2019 14:01:16 +0000 (16:01 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 22 Jun 2019 14:01:16 +0000 (16:01 +0200)

Trivial merge