Merge branch 'master' into cmake-gui-qrc-fix

15 jobs for cmake-gui-qrc-fix