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