Merge remote-tracking branch 'origin/pull/504'

* origin/pull/504:
  fix(yubikey): Handle errors and multiple smartcards