r20816: merge from samba3: