Merge branch 'canvasredesign' into cairocanvas