* Sync to trunk r51266. svn path=/branches/cmake-bringup/; revision=51268
- Sync with trunk r51165. svn path=/branches/cmake-bringup/; revision=51166