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