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