Summary of changes: f4a3bda... Update to latest upstream release. (*) fea9bb9... Update patch for new source. (*) 24f3175... Fix conflicts. (*) This commit already existed in another branch; no separate mail sent