Updated files to match the 1.8 release.