Merge pull request #812 from google/release-0.6

release 0.6