fixes for makina-projects
Merge branch 'master' of github.com:makinacorpus/makina-states into nodejs