Merge dojo_rules into master