Merge branch 'export-dialog' into cairocanvas