Address a warning
Make delete-file-and-buffer vc aware
Merge remote-tracking branch 'upstream/master'