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