Merge pull request #559 from wigyori/cc-misc2
authorZoltan Herpai <wigyori@uid0.hu>
Wed, 18 Oct 2017 07:12:35 +0000 (09:12 +0200)
committerGitHub <noreply@github.com>
Wed, 18 Oct 2017 07:12:35 +0000 (09:12 +0200)
CC: upgrade openssl, fix ugps compilation

Trivial merge