piwik 6.x-2.6 update
merge piwik updates accidentally made in branch 'drupal7'