Merged with https://github.com/seemethere/unir Upstream-commit: 091c4453b8e294b0e10ea9fe24c784c2086719be Component: packaging