Merge remote-tracking branch 'origin/master' into kernel-4.14
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 3 Apr 2018 18:15:58 +0000 (20:15 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 3 Apr 2018 18:15:58 +0000 (20:15 +0200)

Trivial merge