Merge branch 'master' of /home/jmcd/samba/git.samba.org/samba-master into mymaster