Merge branch 's11_MDL-28284_filepicker_module_master' of git://github.com/dongsheng...