Update pkglists
Fix merge
Fix issues with last commit
You can also use your local clone with git send-email.