Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorStefan Schantl <stefan.schantl@ipfire.org>
Wed, 27 Jun 2018 17:33:43 +0000 (19:33 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Wed, 27 Jun 2018 17:33:43 +0000 (19:33 +0200)

Trivial merge