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

Sync with the CM tree after latest changes