Merge branch 'group-by-global' of git://github.com/stoned/ansible into devel

Conflicts:
	lib/ansible/runner/action_plugins/group_by.py

lib/ansible/runner/action_plugins/group_by.py

@@ -55,11 +55,9 @@ class ActionModule(object):
         groups = {}
 
         for host in self.runner.host_set:
-
+            if not check_conditional(template.template(self.runner.basedir, self.runner.conditional, inject)):
-            data = inject['hostvars'][host]
-            if not check_conditional(template.template(self.runner.basedir, self.runner.conditional, data)):
                 continue
-            group_name = template.template(self.runner.basedir, args['key'], data)
+            group_name = template.template(self.runner.basedir, args['key'], inject)
             group_name = group_name.replace(' ','-')
             if group_name not in groups:
                 groups[group_name] = []