Remove symlink for nonexistent file
Merge branch 'master' into steele