Merge remote-tracking branch 'origin/next'
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 27 Jan 2018 18:14:47 +0000 (19:14 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 27 Jan 2018 18:14:47 +0000 (19:14 +0100)

Trivial merge