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