Merge commit 'openembedded.org/org.openembedded.dev' into org.openembedded.dev