Merge branch 'master' into qtquick2