Pick commit from 2.13 branch as 2.12 branch is unmaintained now. (From OE-Core rev: 2335d4f0d1826647eaee224c469331980fc84ed2) Signed-off-by: Peter Marko <peter.marko@siemens.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>