am 109038dd: (-s ours) Fix problem with const result from strchr() [DO NOT MERGE]

Merge commit '109038dd9c68bcc9ec5e247b7488c67785ac95fb'

* commit '109038dd9c68bcc9ec5e247b7488c67785ac95fb':
  Fix problem with const result from strchr() [DO NOT MERGE]