Merge branch 'master' into deployqt4-cmp0080-fix