Merge remote-tracking branch 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 22 Oct 2015 21:38:27 +0000 (23:38 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 22 Oct 2015 21:38:27 +0000 (23:38 +0200)

Trivial merge