Merge branch 'master' into 2.1-merge

# Conflicts:
#	.travis.yml
#	composer.json
#	src/json-rpc/src/CoreMiddleware.php

Author: limingxinleo

tests/Stub/ContainerStub.php

@@ -33,7 +33,7 @@ public static function mockContainer()
         $container->shouldReceive('get')->with(ConfigInterface::class)->andReturn(new Config([
             'redis' => [
                 'default' => [
-                    'host' => 'localhost',
+                    'host' => '127.0.0.1',
                     'auth' => null,
                     'port' => 6379,
                     'db' => 0,