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