Merge branch 'vendor/TOP'
authorSascha Wildner <saw@online.de>
Thu, 17 May 2018 20:04:54 +0000 (22:04 +0200)
committerSascha Wildner <saw@online.de>
Thu, 17 May 2018 20:04:54 +0000 (22:04 +0200)

Trivial merge