Sync with trunk head (r48826) svn path=/branches/cmake-bringup/; revision=48831
svn path=/branches/cmake-bringup/; revision=48236