Reproduces issue #143 (yeyyyy)
Merge branch 'develop' of github.com:syncany/syncany into develop