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