Merge pull request #583 from tdb/fix_ppa_pluses