Merge branch '1.1-ed25519' into 1.1