On the '1.9-cache-improvements' branch: catch up to trunk@1678968.
On the '1.9-cache-improvements' branch: catch up to trunk@1678968.

git-svn-id: 55fce1777d54e23d563e29785a1eeb58fd1b6a55@1678969 13f79535-47bb-0310-9956-ffa450edef68

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