Update to d4108cb from source