(cherry picked from commit 372c155800)
372c155800
Signed-off-by: Arnaud Morin <arnaud.morin@gmail.com>