On the 1.9-cache-improvements: Merge latest fixes r1679679 and r1679681 from 1.10-cache-improvements. There were no conflicts.
On the 1.9-cache-improvements:
Merge latest fixes r1679679 and r1679681 from 1.10-cache-improvements.
There were no conflicts.

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

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