[securityguide: 3/3] Merge branch 'yubikey_neo'