Pull in latest from marcuscom, and fix a bug building graphics/cogl