Merge pull request #396 from jhoekx/setup-json

Arguments to setup module should be json.

lib/ansible/runner.py

@@ -275,6 +275,8 @@ class Runner(object):
             return [ utils.smjson(dict(skipped=True)), None, 'skipped' ]
 
         if self.module_name == 'setup':
+            if not args:
+                args = {}
             args = self._add_setup_vars(inject, args)
             args = self._add_setup_metadata(args)