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