It's upstream now with a one trivial fix. Signed-off-by: Rafał Miłecki <rafal@milecki.pl> (cherry picked from commit f975ab8f4e)
f975ab8f4e