Reproduce #303
Merge branch 'develop' into bugfix/issue303-delete-moved-files
Fixes #303