Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	Umbraco.gitignore

diff --cc Umbraco.gitignore
index fe156c68d739fb586c5a5e448bfa1bedc3b5ea7b,5649531412a32baea5c63c69a4c0cf740edda2ee..6032b670d0366d0a9d2bb9e902ca52790be69a2a
--- 1/Umbraco.gitignore
--- 2/Umbraco.gitignore
+++ b/Umbraco.gitignore
@@@ -23,9 -29,4 +29,9 @@@
  **/App_Data/cache/
  
  # Ignore the Models Builder models out of date flag
- **/App_Data/Models/ood.flag
+ **/ood.flag
 +
 +# NEW for version 9 .Net 5 (Core)
 +**/umbraco/Data/*
 +**/umbraco/mediacache
- **/wwwroot/umbraco/lib
++**/wwwroot/umbraco/lib