Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 1 Apr 2016 11:29:40 +0000 (13:29 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 1 Apr 2016 11:29:40 +0000 (13:29 +0200)

Trivial merge