Fix warning about strcasestr being undeclared; remove unused variable
Merge branch 'master' into master_with_coverage