GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3092
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3029