Merge remote-tracking branch 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 28 Sep 2015 16:40:32 +0000 (18:40 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 28 Sep 2015 16:40:32 +0000 (18:40 +0200)

Trivial merge