On the pin-externals branch, merge outstanding change from trunk.
On the pin-externals branch, merge outstanding change from trunk.


git-svn-id: 50c5f5df37af4354ae6e67714fc94b8d09273154@1655674 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion