Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 11 Dec 2018 07:01:59 +0000 (08:01 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 11 Dec 2018 07:01:59 +0000 (08:01 +0100)

Trivial merge