Changed outputstream to UploadOutputStream.
Merge branch 'master' into auth