f2b283ccaf
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 479b042433)
[Peter: drop 6.1.x bump]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>