Fix strstr and strcasestr.
Merge commit '3a74dc'