Merge branch 'paramsessionkey' into upstream-4.0-stable
b : Filename with emphasis char are not correctly process
Small fix to handle big files
Merge branch 'upstream-charset' into upstream-master