Merge branch 'master' into export-dialog