Bring up to date with main repo.
Add package info to XML output.