Integrate recent changes from Google-internal code tree.  See CHANGES.txt
for details.

97 files changed