Analytics: Slight changes to validate analytics data and send less of it
Merge branch 'master' into eve