Initial check-in from June 15th tarball.