GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/2977
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/2252