Refs #3456, fixing build.
Merge branch 'master' of https://github.com/piwik/piwik