Merge branch 'cairocanvas' into windows+cc