Merge branch 'switch-2fa' into 'master'

Let the user pick 2FA method

See merge request !2
4 jobs for master in 4 minutes and 39 seconds
Status Job ID Name Coverage
  Build Pkgsrc
passed #7639
build_pkgsrc:stretch

00:00:15

 
  Build Pkg
passed #7640
amd64
build_pkg:stretch:amd64

00:00:52

passed #7641
arm64
build_pkg:stretch:arm64

00:02:36

 
  Upload Pkg
passed #7642
upload_pkg

00:01:47