Update from samba tree revision 12488 to 12669