rm cmake from the release branch before it goes out broken.  Policy dictates that you never commit to release, you commit to trunk and merge to release.
Merge warning fix from trunk. Fixes #1414.
Merge from trunk
Merge from trunk
Merge from trunk