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