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

Sync with the CM tree after latest changes