Merge branches 'mdw/latin-ietf' and 'mdw/curve25519'