Fixes #3833 adding check upstream. Thx for the report & patch, very nice bug to fix!
Move the "Providers" array to its own core/DataFiles/Providers.php
Additional check
Merge branch 'master' of https://github.com/piwik/piwik into 3697_ISP_Names