Merge branch 'master' of github.com:bluejekyll/rust-openssl