Merge branch '6.x' into 7.x

Author: GrahamCampbell

.github/workflows/tests.yml

@@ -79,6 +79,11 @@ jobs:
     name: PHP ${{ matrix.php }} - ${{ matrix.stability }} - Windows
 
     steps:
+      - name: Set git to use LF
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
+
       - name: Checkout code
         uses: actions/checkout@v2