Signed-off-by: Julien Malik <julien.malik@paraiso.me> (cherry picked from commit f35f4dace7)
f35f4dace7