Merge branch 'v4-0-logon' of git://git.id10ts.net/samba into 4-0-local