Merge fix for pam-wrapper