Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 10 Jun 2017 20:38:32 +0000 (22:38 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 10 Jun 2017 20:38:32 +0000 (22:38 +0200)

Trivial merge