Test new machine.
working on pam
Merge remote-tracking branch 'origin/master'