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