Merge remote-tracking branch 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 27 Mar 2016 20:17:16 +0000 (22:17 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 27 Mar 2016 20:17:16 +0000 (22:17 +0200)

Trivial merge