Merge branch 'master' into update-ring

deploy.sh

run_desktop_tests.sh

src/ctap/ctap1.rs

src/ctap/key_material.rs

src/ctap/mod.rs