Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit fe174fc8fc4bbdb050014a945de7eb9b28ba358e)