Merge branch 'cedarcode:master' into nt--test-against-openssl-latest-versions

Author: nicolastemciuc