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