Removing further urchin tracking code
Merge branch 'development' into release-2.9