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