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