uniformize piwik code among branches