Fix build for Manta
Update Manta dependencies
Merge pull request #113 from apascual89/cm-10.1

Fix build for Manta