Merge branch 'v4-0-test' of /home/jelmer/samba4