Merge commit 'samba/v3-2-test' into wbc-test