am 45faade2: Merge "Replaces uses of index() with strchr()."

* commit '45faade28ae9e245e7c611c26990254aba006d2a':
  Replaces uses of index() with strchr().