[aur-general] merge pms-git into np1-mps-git