Final commit from Cocoaconf