Squashed 'core/' changes from fdeed66..4ecbe67

4ecbe67 Attempting to fix the issue #161

git-subtree-dir: core
git-subtree-split: 4ecbe67bcea3b8e55d1620b91988f79270c002e9
Merge commit 'a4b806eae65348523276e8361dd98520c62fe1ac' into develop
Squashed 'core/' changes from 4ecbe67..a9b8ca5

a9b8ca5 Merge branch 'develop' of github.com:syncany/syncany into develop
429bb5e Add comment to why this statement helps, fixes #161
4516b59 Update CHANGELOG.md

git-subtree-dir: core
git-subtree-split: a9b8ca55d90f927c3650bf37fdf74631049c8d87
Merge commit '66e3badfec31c075f03752277cef7df888005c32' into develop