am eac2bbf0: Merge "Add extra strchr testing."

* commit 'eac2bbf0fce2da710bb086414ad1054568747a42':
  Add extra strchr testing.