Merge "Fix language statistics after messages have been moved to JSON"