Merge branch 'qtcreatorpackaging'