Ensure that empty files are not changed
Merge branch 'dont-alter-empty-files'