Merge branch 'master' into 3.0

.github/workflows/publish_api_documentation.yml

@@ -15,10 +15,15 @@ jobs:
     - uses: actions/checkout@v2
       with:
         fetch-depth: 0
-        ref: "3.0"
+        ref: "gh-pages"
     - uses: actions/setup-python@v2
       with:
         python-version: 3.6
+    - name: Merge changes from 3.0 branch
+      run: |
+        git config user.name github-actions
+        git config user.email github-actions@github.com
+        git merge origin/3.0 -X theirs
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
@@ -32,11 +37,7 @@ jobs:
         python3 publish_api_documentation.py
     - name: Publish the API documentation
       run: |
-        git config user.name github-actions
-        git config user.email github-actions@github.com
         git add docs
         git status
         git commit -m "Publish API documentation"
-        git checkout gh-pages
-        git merge 3.0 -X theirs
         git push