Merged hotfix
Merge branch 'master' of https://github.com/dany2k9/dojo_rules