[Upstream Migration r62382] Merge branch 'upstream' into svn_merge