Merge branch 'curve25519'