System/FileSystem: merge from trunk to fix #7278.

svn path=/branches/release/libs/filesystem/; revision=83550