Merge branch 'security/4.92.1'
authorHeiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>
Sat, 20 Jul 2019 21:14:17 +0000 (23:14 +0200)
committerHeiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>
Sat, 20 Jul 2019 21:14:17 +0000 (23:14 +0200)

Trivial merge