Down-integrate pending changes from internal repository after previous release.


git-svn-id: http://protobuf.googlecode.com/svn@525 630680e5-0e50-0410-840e-4b1c322b438d