(cherry picked from commit 50fe8e1180d012caf19d421229143344d4242405)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>