Upgrade to CM 1.17.0
Merge pull request #264 from njam/issue-264

Upgrade to CM 1.17