s3 fix
Merge branch 'master' of github.com:cloud66/help