Typo in comment
Merge branch 'master' of github.com:piwik/piwik
Using SettingsPiwik::getPiwikUrl() instead of getCurrentUrlWithoutFileName() when possible