Merge "Overhaul site_stats table"