Merge remote-tracking branch 'origin/master' into 2.0.x

Author: anahan

composer.json

@@ -9,7 +9,7 @@
   "require": {
     "php": ">=7.1",
     "apache/thrift": "0.11.*",
-    "psr/log": "~1.0.2"
+    "psr/log": "^1.0.2"
   },
   "require-dev": {
     "phpunit/phpunit": "@stable"