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