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