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