Fixes regression
Merge remote-tracking branch 'origin/master'
Prevent the site selector to push the content bellow
Merge branch 'master' of github.com:piwik/piwik