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