Merge branch 'master' into develop
Updated qt version
Merge branch 'develop'