Updating: improving contrib/cairo.
Updating: merging.