Merge remote-tracking branch 'origin/master' into next v2.19-core104
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 6 Aug 2016 10:11:46 +0000 (12:11 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 6 Aug 2016 10:11:46 +0000 (12:11 +0200)

Trivial merge