Merged in commit 9f04cb7bb6f9753e32988127038b648afbd9b974 from meta-qt5