Merge remote-tracking branch 'trevp/pempick' into OpenSSL_1_0_2-stable