Summary of changes: 65dc308... Update to latest upstream 1.0 (#827880) Use versions of plu (*) d746224... Restore two files that are not yet in contrib (*) (*) This commit already existed in another branch; no separate mail sent