Sync with the CM tree after latest changes
Merge pull request #34 from NBruderman/patch-29

Sync with the CM tree after latest changes