fix for weekly stats
Merge branch 'master' into users_stats