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

* commit 'b24d6be07615e1636bf5713e06d20ac4185b7cb3':
  Fix typo in option parsing.