Fixes: - No autobuilder failures yet Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> (cherry picked from commit 25d602a6a66bfecf17da0ca5edf589ace95e58db) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>