Merge branch 'master' into 1.2.1_google

wjc

2025-07-07 29e200b8db74d31f49d4d1ac64a41ad44e1b3a90

 .gitignore

@@ -52,3 +52,4 @@
.idea/workspace.xml
.idea/
*.properties
local.properties