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

Sync with the CM tree after latest changes