Update to revision c94917dab530