Merge branch 'master' into ecdhe-support