merge #896
merge #896

tomateos/S3,scality/S3,tomateos/S3,scality/S3,scality/S3,tomateos/S3,tomateos/S3,scality/S3,tomateos/S3,tomateos/S3,scality/S3,scality/S3,scality/S3,scality/S3,tomateos/S3,tomateos/S3