merge master into log_stats_tracking

i want this stuff.