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

Sync with the CM tree after latest changes