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