Winbind merges from HEAD: