rebase to mozStumbler part 2