Sync with trunk. (r49792) svn path=/branches/cmake-bringup/; revision=49803
svn path=/branches/cmake-bringup/; revision=48236