Reproduce Pim's test case from #266
Merge branch 'bugfix/cleanup-checkpoint' of github.com:syncany/syncany into bugfix/cleanup-checkpoint