Merge branch 'vendor/OPENSSL'
authorSascha Wildner <saw@online.de>
Tue, 3 May 2016 19:53:00 +0000 (21:53 +0200)
committerSascha Wildner <saw@online.de>
Tue, 3 May 2016 19:53:00 +0000 (21:53 +0200)

Trivial merge