Merge tag 'samba-4.0.13' into v4-0-test