Update cl-grace upstream per #543.