refs #4126 cleanup
Merge branch 'master' of github.com:piwik/piwik