fixed ccmp
Merge branch 'Zq' of github.com:saraedum/sage into Zq