Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 19711af5cd)
19711af5cd