merge exportvis branch into cairocanvas, to reduce the number of "floating" branches.