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