Copy paste code... check and re-check
Merge branch 'pamauth' into pending