(cherry picked from commit 1cb530379f592f7308fd87b70a0267157894ccea)
Signed-off-by: Sébastien Escudier <sebastien-devel@celeos.eu>