9695fc6
- sync with F-12 version to bring it up to 3.6.20 - fixes #531232 but avoid introducing #525477 on F-11