Signed-off-by: Sebastien Goasguen <runseb@gmail.com> (cherry picked from commit 1516b041bc)
1516b041bc