Merge remote-tracking branch 'origin/next'
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 12 Dec 2017 20:33:10 +0000 (21:33 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 12 Dec 2017 20:33:10 +0000 (21:33 +0100)

Trivial merge