merges from sudo - upstream