Added fix for file uplaods not working due to overloaded method not being invoked
Merge remote-tracking branch 'origin/master'