changed _pUploadContent, and _pSetSize to pUploadContent, and pSetSize in accordance to new naming convension.
Merge remote-tracking branch 'origin/master'