small fixes
fixes
Merge branch 'master' of https://github.com/makinacorpus/makina-states
Merge remote-tracking branch 'origin/stable'