making s3 work again, moving target
Merge remote-tracking branch 'origin/develop' into develop