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