sync with trunk (r49230) svn path=/branches/cmake-bringup/; revision=49246
- More work on the base modules. By Alexey Komarov. svn path=/branches/cmake-bringup/; revision=48984