GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3610
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3609