Merge changes I9abd00af,Id0e75f71

* changes:
  Upgrade to OpenSSL 1.0.1h
  Use numbering for patch orders