partially clean up warnings from "prolooks" code
Merge branch 'master' into cairocanvas