Merge pull request #3710 from toulet/develop

Fix an "strpos(): Empty needle" warning