features 2 updated
Merge branch 'contrib'
Merge branch 'master' of https://github.com/yvandouenel/ccrc