Merge branch 'master' of github.com:evolvethinking/evolve_cfengine_freelib
Merge branch 'master' of github.com:evolvethinking/evolve_cfengine_freelib