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

Sync with the CM tree after latest changes