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