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