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