rb1.0
Merge branch 'release_branch_1.0' of https://github.com/kenp11/dojo_rules into release_branch_1.0
Merge branch 'master' into release_branch_1.0
Merge branch 'release_branch_1.0'