Merge branch 'tdr' of /home/jelmer/samba4