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