Merge with latest changes from https://github.com/PAC-man/pacman