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