Update S3 model to latest version

Fixes #392.
Merge branch 'fix-expiration' into develop

* fix-expiration:
  Update S3 model to latest version