* Sync with trunk r51323. svn path=/branches/cmake-bringup/; revision=51329
svn path=/branches/cmake-bringup/; revision=48236