JOHNE - Merge the latest changes from git://anongit.freedesktop.org/git/cairo