ned21/CCM — pull request #1 by ned21 (2014-01-02 14:48:12+00:00)
Title: Merge in quattor/CCM master

Bring this fork up to date.