Merge remote-tracking branch 'origin/next'
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 23 Sep 2017 08:38:18 +0000 (10:38 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 23 Sep 2017 08:38:18 +0000 (10:38 +0200)

Trivial merge