Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 3 Jul 2018 10:52:18 +0000 (11:52 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 3 Jul 2018 10:52:18 +0000 (11:52 +0100)

Trivial merge