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