Merge "Fix for bug 2467152 files with spaces fail to open."