winbindd merges from HEAD