Merge pull request #265 from cushon/master

Update from internal.