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