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