Merge remote-tracking branch 'upstream/master' into Feature-UploadFailureRecover
Merge remote-tracking branch 'upstream/master' into Feature-UploadFailureRecover
fixes function assignment
Merge pull request #71 from andreywix/Feature-UploadFailureRecover

Feature - Upload failure recover