Upstream cherry-pick - http://gitweb.samba.org/?p=samba.git;a=commitdiff;h=c4fd9ff890e2640ef90b4d7129621e3fe800a61e
Upstream cherry-pick - http:// gitweb. samba.org/ ?p=samba. git;a=commitdif f;h=c4fd9ff890e 2640ef90b4d7129 621e3fe800a61e