Merge branch 'master' into master

Author: cmfcmf

composer.json

@@ -23,7 +23,7 @@
         "ext-simplexml": "*",
         "psr/cache": "^1.0",
         "psr/http-client": "^1.0",
-        "psr/http-message": "^1.0"
+        "psr/http-factory": "^1.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.0.5",