s3 fixes
Merge branch 'hotfix/0.1.2' into appsembler_master