Merge master into 0.5.X without squashing to fix future GitHub diffs

Author: ulupo

azure-pipelines.yml

@@ -46,7 +46,7 @@ jobs:
 
   - task: Cache@2
     inputs:
-      key: '"ccache-wheels-v2021.07.08" | $(Agent.OS) | "$(python.version)"'
+      key: '"ccache-wheels-v2021.07.09" | $(Agent.OS) | "$(python.version)"'
       path: $(CCACHE_DIR)
     displayName: ccache
 
@@ -146,7 +146,7 @@ jobs:
 
   - task: Cache@2
     inputs:
-      key: '"ccache-v2021.07.08" | $(Agent.OS) | "$(python.version)"'
+      key: '"ccache-v2021.07.09" | $(Agent.OS) | "$(python.version)"'
       path: $(CCACHE_DIR)
     displayName: ccache