Fixed quotes in file name issue
Merged in upstream changes.