Fix shfolder.dll not getting freed
Merge remote-tracking branch 'upstream/master'