Merge commit 'c124f4f2e04dca16a428a76c89677328bc7bf908' as 'yocto-poky'