Fixed context problems with uploadProgress
Merge remote-tracking branch 'origin/master'