Merge branch 'master' into qt-switch-gui