Merge remote-tracking branch 'origin/next'
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 21 Feb 2018 12:06:21 +0000 (12:06 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 21 Feb 2018 12:06:21 +0000 (12:06 +0000)

Trivial merge