reverting my broken revert -> we'll add a UI test screenshot for it!
Merge branches 'master' and 'master' of github.com:piwik/piwik