Merge branch '2.0.x' into 1.0.x

# Conflicts:
#	composer.json

Author: allflame

composer.json

@@ -12,7 +12,7 @@
     "symfony/console": "~2 || ~3",
     "symfony/http-kernel": "~2 || ~3",
     "symfony/dependency-injection": "~2 || ~3",
-    "code-tool/jaeger-client-php": "~1.6 || ~2.6"
+    "code-tool/jaeger-client-php": "~1.7 || ~2.7"
   },
   "require-dev": {
     "php-ds/php-ds": "@stable",