Merge pull request #2427 from alex/ecdh

ECDH take 4