Correct it
Merge remote-tracking branch 'refs/remotes/upstream/master'
Merge remote-tracking branch 'refs/remotes/upstream/master'
Remove a warning by making sure the renamed file is a dir before trying and opening it
Merge pull request #1422 from TheSFReader/master

Correct the Cache Scanner so that it doesn't try and scan subdirs of a non-dir path when renaming