Merge branch 'sudo-without-pam' into next