am 422b2e53: Merge "Fix typo in option parsing."

* commit '422b2e538fbcd8111ea34960804f0f9793e5653a':
  Fix typo in option parsing.