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