Merge branch 'v5.3' into v5.4

# Conflicts:
#	.travis.yml

Author: vyuldashev

.travis.yml

@@ -11,4 +11,4 @@ before_script:
   - composer self-update
   - composer install --no-interaction
 script:
-  - phpunit --no-coverage
+    - phpunit --no-coverage