merge all commits from syncthing/syncthing