Merge pull request #497 from dotnet/31GA-snap