Merge "Changes uses of index() to strchr()"