Pr 428

Grafts peter's pr 428 from socorro-crashstats onto our new tree structure.