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