prevent bytesUploaded from getting bigger than size
Merge origin/master