uniformize piwik code among branches

--HG--
branch : 3.2