Pre-pull request merging

Adding Cairo dependency to build system manually, to have a clean merge.