refs #4691 added more test cases
Merge branch 'master' of github.com:piwik/piwik