Pull r638 from Google Code