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