Disable analytics.users.active
Merge branch 'master' into production