merge latest commits from Pacman