Merge HEAD's winbind into 3.0.