using this for s3 module testing
Merge remote-tracking branch 'upstream/master'