merge 5764970709f15e85ec30c9cea89c318eb8114c58 from cairocanvas as final(?) change...