219b4a626c
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 716b8c4e7b)
[Peter: drop 6.0.x bump]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>