WIP
Merge branch 'progress' of github.com:AudriusButkevicius/syncthing