Merge from pch-branch.

From-SVN: r61136
130 files changed