Merge pull request #1 from google/beta-3

Beta 3