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