color
Merge branch 'milestone-1.0.6b' of github.com:soctrace-inria/ocelotl into milestone-1.0.6b