Merge branch 'master' into qt5