Merge proposals dependent on lp:~james-w/pkgme/fix-up-licenses

lp:~james-w/pkgme/fix-up-licenses has no merge proposals.