Sync trunk (rr49606) svn path=/branches/cmake-bringup/; revision=49607
svn path=/branches/cmake-bringup/; revision=48236