Merge branch 'master' into config_step_2

Conflicts:
	core/Console.php
	piwik.php

1 files changed, 1 insertions, 1 deletions

diff --git a/piwik.php b/piwik.php
index b0915e38a1..f3e0ba934a 100644
--- a/piwik.php
+++ b/piwik.php
@@ -52,7 +52,7 @@ require_once PIWIK_INCLUDE_PATH . '/core/Cookie.php';
 // TODO should move to Tracker application class later. currently needed for environment validation.
 SettingsServer::setIsTrackerApiRequest();
 
-$environment = new \Piwik\Application\Environment(null);
+$environment = new \Piwik\Application\Environment('tracker');
 $environment->init();
 
 Tracker::loadTrackerEnvironment();