Merge branch 'windows+cc' into cairocanvas