Fix setting the 'pac' alias
merge master