Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows