Added handing of storing snapshots in s3.
Merge branch 'test' into dev
Bump.