Fix for analytics
Merge branch 'hotfix/fix_analytics_sept_11_13'