Merge in quattor/CCM master

Bring this fork up to date.