merge #910
merge #910

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