Merge branch 'master' into gui
Merge branch 'gui' of https://github.com/vwiencek/syncany into gui
Merge branch 'gui' of https://github.com/vwiencek/syncany into gui
Merge branch 'gui' of https://github.com/vwiencek/syncany into gui
Merge branch 'gui' into feature/gui