Resolve merge commit.

lib/ansible/runner/__init__.py

@@ -339,6 +339,8 @@ class Runner(object):
         inject['groups'] = self.inventory.groups_list()
         inject['vars'] = self.module_vars
         inject['environment'] = self.environment
+        if self.inventory.basedir() is not None:
+            inject['inventory_dir'] = self.inventory.basedir()
 
         # allow with_foo to work in playbooks...
         items = None