r19017: Merge from Samba3: