diff --git a/AUTHORS b/AUTHORS
index 4546b3178..0caa352f9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -23,6 +23,7 @@ Christian Theunert
 Christian Tismer
 Christopher Gilling
 Daniel Grana
+Daniel Hahler
 Daniel Nuri
 Dave Hunt
 David Mohr
diff --git a/_pytest/hookspec.py b/_pytest/hookspec.py
index 4c79d1d5e..60e9b47d2 100644
--- a/_pytest/hookspec.py
+++ b/_pytest/hookspec.py
@@ -81,7 +81,7 @@ def pytest_cmdline_main(config):
     """ called for performing the main command line action. The default
     implementation will invoke the configure hooks and runtest_mainloop. """
 
-def pytest_load_initial_conftests(args, early_config, parser):
+def pytest_load_initial_conftests(early_config, parser, args):
     """ implements the loading of initial conftest files ahead
     of command line option parsing. """