Merge branch 'qtupdate'