Fix setting the 'pac' alias
Merge remote-tracking branch 'upstream/master'