Merge branch '4.3' into 4.4

* 4.3:
  Remove Google references when not needed
  Simplify usage of dirname()
  Remove Google references when not needed

Author: fabpot

DeprecationErrorHandler/Deprecation.php

@@ -267,7 +267,7 @@ private static function getVendors()
             foreach (get_declared_classes() as $class) {
                 if ('C' === $class[0] && 0 === strpos($class, 'ComposerAutoloaderInit')) {
                     $r = new \ReflectionClass($class);
-                    $v = \dirname(\dirname($r->getFileName()));
+                    $v = \dirname($r->getFileName(), 2);
                     if (file_exists($v.'/composer/installed.json')) {
                         self::$vendors[] = $v;
                         $loader = require $v.'/autoload.php';