refs #4337 some more test fixes
Merge branch 'master' of github.com:piwik/piwik