fix bug 47949681
Merge remote-tracking branch 'vmw-tmpst/master' into fix-file-uploader
Merge pull request #194 from whywhy36/fix-file-uploader

Fix file uploader