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.
Spirit: merging from trunk upto rev. 61489
Merge format from the trunk.  This should fix the regressions resulting from the partial merge in [63640].