Merge upstream change: pacman 4.1 compatibility