Remove Piwik tracking
Merge branch 'develop'