Update to c15d9f8 from source