Merge branch 'master' into pkcs7-padding