Pull CC into master

I mean it this time.