Merge remote-tracking branch 'upstream/master'
authorJonatan Schlag <jonatan.schlag@ipfire.org>
Sun, 16 Sep 2018 14:15:52 +0000 (16:15 +0200)
committerJonatan Schlag <jonatan.schlag@ipfire.org>
Sun, 16 Sep 2018 14:15:52 +0000 (16:15 +0200)

Trivial merge