Fixed problem with linking against libcrypto 1.0.0 in the GZ
Merge branch 'test' into dev