Merge branch 'master' into kazuho/cert-ed25519