Fix test on PHP 5.3.3
Merge branch 'master' of github.com:piwik/piwik