Patch cherry-picked from upstream, can be removed upon next release. Signed-off-by: Mario Lang <mlang@blind.guru> [Thomas: move patch out of per-version directory.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>