Updating to latest mainline Cogl 1.18