Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 5 Aug 2018 15:19:36 +0000 (17:19 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 5 Aug 2018 15:19:36 +0000 (17:19 +0200)

Trivial merge