am 04b08bdf: Merge "Be more forgiving in parsing verifier IDs"

* commit '04b08bdf19497c31abdef49100bfe471f8d104d6':
  Be more forgiving in parsing verifier IDs