Merge branch 'release_branch_1.0'
Merge branch 'kill_list' of https://github.com/loducado/dojo_rules into kill_list

* 'kill_list' of https://github.com/loducado/dojo_rules: