Merge branch 'ben/timing-1.0.1' into OpenSSL_1_0_1-stable