GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4352 LGTM: AudriusButkevicius, calmh
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3017