Fixed a problem with the S3 helper
New migration code
Merge branch 'develop'