5f234c17e8
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit cb60af6002)
[Peter: drop 5.2.x bump]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>