Roll s3-libs version 0.12.5
Merge branch 'release/0.12.5' into develop